Add a block around the WM_ACTIVATE case to avoid declaring variables in

2007-10-19  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkevents-win32.c (gdk_event_translate): Add a block
	around the WM_ACTIVATE case to avoid declaring variables in the
	middle of a block. (#488017)

svn path=/trunk/; revision=18932

diff --git a/ChangeLog b/ChangeLog
index 58f648a327b6f9837489231dffd58b45b1adafd7..15bf4d3ffde6925e82afe83b04ed6235cce544eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-19  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkevents-win32.c (gdk_event_translate): Add a block
+       around the WM_ACTIVATE case to avoid declaring variables in the
+       middle of a block. (#488017)
+
 2007-10-18  Cody Russell  <cody@jhu.edu>
 
        * modules/engines/ms-windows/msw_style.c: Draw focus rect for

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index a03833bda2ed7d0292c2af237db71ed07bfa3a85..3bf526da150cc2fb8ac837a9e7858da37ed0621f 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -3363,9 +3363,7 @@ gdk_event_translate (MSG  *msg,
        }
       break;
 
-    case WM_ACTIVATE:
-      ;
-
+    case WM_ACTIVATE: {
       /*
        * On Windows, transient windows will not have their own taskbar entries.
        * Because of this, we must hide and restore groups of transients in both
@@ -3406,7 +3404,6 @@ gdk_event_translate (MSG  *msg,
            }
         }
 
-
       /* Bring any tablet contexts to the top of the overlap order when
        * one of our windows is activated.
        * NOTE: It doesn't seem to work well if it is done in WM_ACTIVATEAPP
@@ -3415,7 +3412,8 @@ gdk_event_translate (MSG  *msg,
       if (LOWORD(msg->wParam) != WA_INACTIVE)
        _gdk_input_set_tablet_active ();
       break;
-      
+    }
+
       /* Handle WINTAB events here, as we know that gdkinput.c will
        * use the fixed WT_DEFBASE as lcMsgBase, and we thus can use the
        * constants as case labels.